Skip to content

Perf: select only the target admin policy ID in ProductMarketingWindowManager - #99063

Merged
mountiny merged 1 commit into
Expensify:mainfrom
callstack-internal:trace-selector-deepequals
Aug 20, 2026
Merged

mountiny merged 1 commit into
Expensify:mainfrom
callstack-internal:trace-selector-deepequals

Conversation

@TMisiukiewicz

@TMisiukiewicz TMisiukiewicz commented Aug 20, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

ProductMarketingWindowManager subscribed to the whole policy_ collection with a selector returning Policy[] (every active admin policy), so useOnyx deep-compared all of those policy objects on every policy-collection update — measured at 37ms per compare on a large account. The component only ever used that array to pick a single policy, so the selector now returns just the target policy's ID and the policy object comes from a single-member useOnyx subscription (no selector, so it compares by reference). variant and shouldPrefetchTargetPolicyConnections now branch on the ID instead of the object, which also removes a one-render window where the object could lag the ID and briefly flip the admin variant to the member variant. Target-policy selection (find(id === activePolicyID) ?? at(0)) and everything passed to usePolicyConnectionsPrefetch / getCtaRoute are unchanged.

Perf gain: On account with ~5k policies (large customer account), around ~90ms saved on Web when opening reports from Search

Fixed Issues

$ #99064
PROPOSAL:

Tests

  1. Sign in with an account that is an admin on at least two workspaces, and that has not dismissed the current product marketing announcement.
  2. Verify the product marketing window appears in the bottom-right with the admin variant content (same as before this change).
  3. Verify the CTA navigates to the same destination as on main — Workspace Vendors when the target workspace has the vendor feature and the vendorMatching beta is on, otherwise Workspace More Features.
  4. Dismiss the window and verify it stays dismissed after a reload.
  5. Sign in with an account that is an admin on no workspaces and verify the member variant is shown instead (or no window, if the announcement has no member variant).
  6. Switch the active workspace to another workspace you are an admin of, and verify the CTA points at the newly active workspace.
  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests.

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

@melvin-bot

melvin-bot Bot commented Aug 20, 2026

Copy link
Copy Markdown

@abzokhattab Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot
melvin-bot Bot requested review from dylanexpensify and removed request for a team August 20, 2026 12:35
@mountiny

Copy link
Copy Markdown
Contributor

@codex review
@MelvinBot review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. 🎉

Reviewed commit: 8448c87ca3

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@MelvinBot

Copy link
Copy Markdown
Contributor

Review: LGTM ✅

Correct, well-scoped, and behavior-preserving. The selector now returns just the target policy's ID and the policy object comes from a single-member subscription, which cheapens the per-update comparison from a Policy[] walk to an O(1) string compare. All CI is green (typecheck, unit tests, React Compiler, perf tests); the only red check is Check independent approval, which is the human-approval gate, not a code problem.

I checked the behavioral equivalence against the risky parts of this refactor:

Correctness verification
  • Reactivity to activePolicyID is preserved — this was my main concern, since the selector now closes over activePolicyID (ProductMarketingWindowManager.tsx#L57-L63). react-native-onyx@3.0.95's useOnyx only re-runs a selector when isFirstConnection || shouldGetCachedValue || hasSelectorChanged. Because the selector is an inline arrow recreated every render, memoizedSelector changes every render, so hasSelectorChanged is always true → the selector re-runs each render with the fresh activePolicyID. Switching the active workspace (test step 6) correctly re-targets. If this selector were ever hoisted/memoized to a stable reference, that reactivity would break — worth keeping inline.
  • policy.id ↔ collection key — the selector returns policy.id and then subscribes to `${POLICY}${id}`. Safe: getActivePolicies filters on !!policy.id, and the policy collection is keyed policy_<policy.id>, so the re-fetch resolves the same object.
  • No one-render lag on targetAdminPolicy — the object comes from a key already present in the loaded policy_ collection cache, so useOnyx(policy_<id>) returns it synchronously in the same render (isFirstConnection reads tryGetCachedValue). Its two consumers — usePolicyConnectionsPrefetch and getCtaRoute — both handle an undefined policy anyway.
  • getNonEmptyStringOnyxID(undefined) returns undefined, so the key becomes the concrete non-existent policy_undefined rather than the bare policy_ collection prefix — no accidental whole-collection subscription.
  • !!targetAdminPolicyID vs !!targetAdminPolicy for variant/shouldPrefetch — equivalent, since an ID is only produced from an actual array element, and this also removes the old ID-vs-object lag window as the description notes.
  • isLoading correctly swaps activeAdminPoliciesMetadata → targetAdminPolicyIDMetadata (both POLICY-collection metadata).

One optional note, not a blocker: the selector still calls activeAdminPoliciesSelector internally, which does an O(N) Object.values(policies).filter(...) over the whole collection on every recompute — that traversal cost is unchanged. The measured ~90ms gain comes entirely from cheapening the output comparison (string vs Policy[]) and the re-renders it drove, not from the selector body. Just confirming the mental model is right; if the traversal itself ever shows up in a profile, that'd be a separate follow-up.


view run

@abzokhattab

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
Screen.Recording.2026-08-20.at.15.50.05.mov
Screen.Recording.2026-08-20.at.15.51.39.mov
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-08-20.at.15.39.32.mov
Screen.Recording.2026-08-20.at.15.40.03.mov
Screen.Recording.2026-08-20.at.15.41.23.mov
Screen.Recording.2026-08-20.at.15.41.52.mov

@abzokhattab abzokhattab left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issues found 🚀 LGTM

@melvin-bot
melvin-bot Bot requested a review from mountiny August 20, 2026 13:53

@mountiny mountiny left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes sense to me, thank you

@mountiny
mountiny merged commit 630938d into Expensify:main Aug 20, 2026
43 of 46 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

🚧 mountiny has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify OSBotify mentioned this pull request Aug 21, 2026
55 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 9.4.58-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site changes required ✅

This PR is a pure performance refactor of a single file — src/components/ProductMarketingWindow/ProductMarketingWindowManager.tsx — and it changes no user-facing behavior, feature names, labels, UI, or copy. It only swaps how the component subscribes to the policy_ Onyx collection (selecting an ID instead of a Policy[]) to cut a costly deep-compare; the product marketing window, its variants, CTA destination, and dismissal all behave exactly as before.

Nothing under App/docs/articles documents this component's internals, so there is nothing to update. I did not create a draft help site PR.

If you believe there's a customer-facing behavior here that the help site should cover, let me know the specific article/behavior and I'll draft it.


view run

@IuliiaHerets

Copy link
Copy Markdown

Hi @TMisiukiewicz. Some of these test steps, specifically those involving beta flags and React DevTools, are difficult for us to reproduce. Could you please check this PR internally on your side?

cc @mountiny @dylanexpensify @abzokhattab

@m-natarajan

Copy link
Copy Markdown

@TMisiukiewicz @vitHoracek Can you please confirm vendorMatching beta is on for Expensifail accounts?

@mountiny

Copy link
Copy Markdown
Contributor

added for +@applause.expensifail.com

@m-natarajan

Copy link
Copy Markdown

@TMisiukiewicz @mountiny Validated the steps except step:9. Not sure what we are seeing console is correct. Can you please check the video

CTA.2.mp4

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/Beamanator in version: 9.4.58-4 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Bundle Size Analysis (Sentry):

@TMisiukiewicz

Copy link
Copy Markdown
Contributor Author

@IuliiaHerets @m-natarajan I'm sorry, step with a console/devtools was some kind of an AI slop that I missed when I created the PR 🤦‍♂️I removed it from test plan, there is no need to test it

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants